cssparser: Add gtk_css_parser_consume_string()

Well, just rename _gtk_css_parser_read_string() for the new semantics,
but this sounds cooler.

diff --git a/gtk/gtkcssfontfeaturesvalue.c b/gtk/gtkcssfontfeaturesvalue.c
index d116157229bc901758b915eea3a14b1374165441..a64ee3fce58c9ff1dcb11b8767a665b13afc8ced 100644 (file)
--- a/gtk/gtkcssfontfeaturesvalue.c
+++ b/gtk/gtkcssfontfeaturesvalue.c
@@ -237,7 +237,7 @@ gtk_css_font_features_value_parse (GtkCssParser *parser)
 
   do {
     _gtk_css_parser_skip_whitespace (parser);
-    name = _gtk_css_parser_read_string (parser);
+    name = gtk_css_parser_consume_string (parser);
     if (name == NULL)
       {
         _gtk_css_value_unref (result);

diff --git a/gtk/gtkcssfontvariationsvalue.c b/gtk/gtkcssfontvariationsvalue.c
index c8d0ab02a0b7f330e7dcd3282dbd43ee4660b073..be3ab90e7225e57d18310f2003788a2e03cd026d 100644 (file)
--- a/gtk/gtkcssfontvariationsvalue.c
+++ b/gtk/gtkcssfontvariationsvalue.c
@@ -235,7 +235,7 @@ gtk_css_font_variations_value_parse (GtkCssParser *parser)
 
   do {
     _gtk_css_parser_skip_whitespace (parser);
-    name = _gtk_css_parser_read_string (parser);
+    name = gtk_css_parser_consume_string (parser);
     if (name == NULL)
       {
         _gtk_css_value_unref (result);

diff --git a/gtk/gtkcssiconthemevalue.c b/gtk/gtkcssiconthemevalue.c
index 82e70775d09c028a298d8b81033d982e2e0a58f9..8d98e4b50dd1989133f52c26d004e6b0d66c8c1a 100644 (file)
--- a/gtk/gtkcssiconthemevalue.c
+++ b/gtk/gtkcssiconthemevalue.c
@@ -150,7 +150,7 @@ gtk_css_icon_theme_value_parse (GtkCssParser *parser)
   GtkCssValue *result;
   char *s;
 
-  s = _gtk_css_parser_read_string (parser);
+  s = gtk_css_parser_consume_string (parser);
   if (s == NULL)
     return NULL;
 

diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c
index ee0dee9afe186c573dcae1ae358bb6e81b6adbe1..3cea6ee0b2218aaa63e73328f8a02b6b75849688 100644 (file)
--- a/gtk/gtkcssimageicontheme.c
+++ b/gtk/gtkcssimageicontheme.c
@@ -133,7 +133,7 @@ gtk_css_image_icon_theme_parse_arg (GtkCssParser *parser,
 {
   GtkCssImageIconTheme *icon_theme = data;
 
-  icon_theme->name = _gtk_css_parser_read_string (parser);
+  icon_theme->name = gtk_css_parser_consume_string (parser);
   if (icon_theme->name == NULL)
     return 0;
 

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 774b1dbdfa81b965ee47d63762d2afbdad45c688..49ba8fe1dcc0adda649cdf54d733eb209d4da5e8 100644 (file)
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -678,7 +678,7 @@ gtk_css_parser_has_function (GtkCssParser    *parser,
 }
 
 char *
-_gtk_css_parser_read_string (GtkCssParser *parser)
+gtk_css_parser_consume_string (GtkCssParser *parser)
 {
   GString *str;
   char quote;
@@ -1019,7 +1019,7 @@ _gtk_css_parser_read_url (GtkCssParser *parser)
           return NULL;
         }
 
-      path = _gtk_css_parser_read_string (parser);
+      path = gtk_css_parser_consume_string (parser);
       if (path == NULL)
         return NULL;
 
@@ -1073,7 +1073,7 @@ gtk_css_parser_resync_internal (GtkCssParser *parser,
     if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_STRING))
       {
         /* Hrm, this emits errors, and i suspect it shouldn't... */
-        char *free_me = _gtk_css_parser_read_string (parser);
+        char *free_me = gtk_css_parser_consume_string (parser);
         g_free (free_me);
         continue;
       }

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 1a77c58cd34a5738521048eeaf1a75062197a220..82474ff3780d05a4dee5b90ad9fcfb0015592989 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -98,6 +98,7 @@ gboolean        _gtk_css_parser_try_hash_color    (GtkCssParser          *parser
                                                    GdkRGBA               *rgba);
 
 char *          gtk_css_parser_consume_ident      (GtkCssParser          *self);
+char *          gtk_css_parser_consume_string     (GtkCssParser          *self);
 gboolean        gtk_css_parser_consume_number     (GtkCssParser          *self,
                                                    double                *number);
 gboolean        gtk_css_parser_consume_function   (GtkCssParser          *self,
@@ -111,7 +112,6 @@ gsize           gtk_css_parser_consume_any        (GtkCssParser          *parser
                                                    gpointer               user_data);
 
 gboolean        _gtk_css_parser_has_number        (GtkCssParser          *parser);
-char *          _gtk_css_parser_read_string       (GtkCssParser          *parser);
 GFile *         _gtk_css_parser_read_url          (GtkCssParser          *parser);
 
 void            _gtk_css_parser_skip_whitespace   (GtkCssParser          *parser);

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f7a611d369956c2a92dff9fd095debb41f2fc664..e119e61a3054473777f934657c1a430291645a32 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -786,7 +786,7 @@ parse_import (GtkCssScanner *scanner)
     {
       char *uri;
 
-      uri = _gtk_css_parser_read_string (scanner->parser);
+      uri = gtk_css_parser_consume_string (scanner->parser);
       file = _gtk_css_parser_get_file_for_path (scanner->parser, uri);
       g_free (uri);
     }

diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c
index f6d0c2bf15c57fab572851ff996e6191dbed0026..0cd7249698e665089daced3e18bab5cfe5d698b0 100644 (file)
--- a/gtk/gtkcssstringvalue.c
+++ b/gtk/gtkcssstringvalue.c
@@ -160,7 +160,7 @@ _gtk_css_string_value_parse (GtkCssParser *parser)
 
   g_return_val_if_fail (parser != NULL, NULL);
 
-  s = _gtk_css_parser_read_string (parser);
+  s = gtk_css_parser_consume_string (parser);
   if (s == NULL)
     return NULL;
   
@@ -200,9 +200,14 @@ _gtk_css_ident_value_try_parse (GtkCssParser *parser)
 
   g_return_val_if_fail (parser != NULL, NULL);
 
+  if (!gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_IDENT))
+    return NULL;
+
   ident = gtk_css_parser_consume_ident (parser);
   if (ident == NULL)
-    return NULL;
+    {
+      g_assert_not_reached ();
+    }
   
   return _gtk_css_ident_value_new_take (ident);
 }

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 77a3d5f719fc36170a37d4f9d07f4b26c1670565..ec0c97cf614ff111c52ba2dfea4c7c3ed76d649e 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -177,7 +177,7 @@ font_family_parse_one (GtkCssParser *parser)
     }
   else 
     {
-      name = _gtk_css_parser_read_string (parser);
+      name = gtk_css_parser_consume_string (parser);
       if (name == NULL)
         return NULL;
     }